From: Chris Swindle <christopher.swindle@metaswitch.com>
Date: Sun, 22 Oct 2017 07:44:11 +0000 (+0100)
Subject: Switch to use registry in the dependency so that it matches RFC2141.
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~5^2~30^2~4
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=eb75b07573883f133c51514ff34f956b0366a475;p=cargo.git

Switch to use registry in the dependency so that it matches RFC2141.
---

diff --git a/src/cargo/sources/registry/mod.rs b/src/cargo/sources/registry/mod.rs
index 4a49ee1b9..2d1e4a00e 100644
--- a/src/cargo/sources/registry/mod.rs
+++ b/src/cargo/sources/registry/mod.rs
@@ -225,7 +225,7 @@ struct RegistryDependency<'a> {
     default_features: bool,
     target: Option<Cow<'a, str>>,
     kind: Option<Cow<'a, str>>,
-    index: Option<String>,
+    registry: Option<String>,
 }
 
 pub trait RegistryData {
@@ -485,11 +485,11 @@ impl<'de> de::Deserialize<'de> for DependencyList {
 fn parse_registry_dependency(dep: RegistryDependency)
                              -> CargoResult<Dependency> {
     let RegistryDependency {
-        name, req, features, optional, default_features, target, kind, index
+        name, req, features, optional, default_features, target, kind, registry
     } = dep;
 
-    let id = if let Some(index) = index {
-        SourceId::for_registry(&index.to_url()?)?
+    let id = if let Some(registry) = registry {
+        SourceId::for_registry(&registry.to_url()?)?
     } else {
         DEFAULT_ID.with(|id| {
             id.clone()
diff --git a/tests/cargotest/support/registry.rs b/tests/cargotest/support/registry.rs
index b303d4dc2..ff4a711cd 100644
--- a/tests/cargotest/support/registry.rs
+++ b/tests/cargotest/support/registry.rs
@@ -39,7 +39,7 @@ struct Dependency {
     kind: String,
     target: Option<String>,
     features: Vec<String>,
-    index: Option<String>,
+    registry: Option<String>,
 }
 
 pub fn init() {
@@ -137,8 +137,8 @@ impl Package {
     pub fn registry_dep(&mut self,
                         name: &str,
                         vers: &str,
-                        index: &str) -> &mut Package {
-        self.full_dep(name, vers, None, "normal", &[], Some(index))
+                        registry: &str) -> &mut Package {
+        self.full_dep(name, vers, None, "normal", &[], Some(registry))
     }
 
     pub fn dev_dep(&mut self, name: &str, vers: &str) -> &mut Package {
@@ -151,14 +151,14 @@ impl Package {
                 target: Option<&str>,
                 kind: &str,
                 features: &[&str],
-                index: Option<&str>) -> &mut Package {
+                registry: Option<&str>) -> &mut Package {
         self.deps.push(Dependency {
             name: name.to_string(),
             vers: vers.to_string(),
             kind: kind.to_string(),
             target: target.map(|s| s.to_string()),
             features: features.iter().map(|s| s.to_string()).collect(),
-            index: index.map(|s| s.to_string()),
+            registry: registry.map(|s| s.to_string()),
         });
         self
     }
@@ -181,7 +181,7 @@ impl Package {
                 "target": dep.target,
                 "optional": false,
                 "kind": dep.kind,
-                "index": dep.index,
+                "registry": dep.registry,
             })
         }).collect::<Vec<_>>();
         let cksum = {